Merge a64df32f415a1361ef36d0cd4aab1f7397d240c8 on remote branch

Change-Id: Icbb1f411ab6bbb8a3a2c7dd2fe043035ab5478a0