Merge 36aed18a0892c3cf92a8f295818c647f6cfc6256 on remote branch

Change-Id: I249dbbb5c54c5c6e99f9904f070b4ae6ff624943