Merge 8f78a2470c2b46560855c577453d247241ba6999 on remote branch

Change-Id: I20c5b90b410e0218f8a5a0794247fda904a99f05