Merge 50ab8834455b13e53c7f729aaf70fd42e9bca96a on remote branch

Change-Id: I1bcb918ec32db1a36edb48773cd205e3b913b951