Merge b625b9dd053efc90656f93e5916b244f133997e9 on remote branch

Change-Id: Ice6bc62cf59ac58bb22088ee396d4b54bcb122bf