Merge 1f4059e7f39c846cbff85e9c5ddfa11c2df16904 on remote branch

Change-Id: I21e0cc790c252af5f67799121ca807860e52589d