Merge 54432a473bfe53d5a0b852eb7098eda42c3d4ef3 on remote branch

Change-Id: I4301105b2cc7b4aa4e3cc3e327ae16dec21f05a9