Merge 22cba6c627d222cbf9b0630dce3c6a8053c3c011 on remote branch

Change-Id: I48db90188cf3b962c89e862281b871f9a7c595e0