Merge 5d92f31c6009455fc5050fee75677c371dc5ff78 on remote branch

Change-Id: I2949a7c746ec644933aa9890fdaaa50063be8aa7