Merge e9a4ba70e1c76cdbf2a783f93fc42c10cb690958 on remote branch

Change-Id: Ied31933055c7a46c43e5a35b65447f731e47c4f2