Merge 5a520856fbd2e3978564dceefa6ed7a5c33841e5 on remote branch

Change-Id: If6bec02934bafe91cbe6e5052760664fa86c7f00