Merge eb1c84e6d1b29977b933a28f83e788f2e50e6d58 on remote branch

Change-Id: Ia49849c537200f6bdc06025c1ff7fbe46486a94e