Merge 360310a4e7d1a7f2cd0827582c05d6961f888c26 on remote branch

Change-Id: I9204b8c8dceb44ca58e1b4b80e9fff8d2535da8e