Merge 0b36fd225fc40639c9f9aa7a6df4af2355249aa7 on remote branch

Change-Id: Ib12184b1d7b62e1c9ee1e3027c7b3be3faaa4fcf