Merge f6f3a00da063bf443389fd71c3f84e9340236d13 on remote branch

Change-Id: Ie573231c34a8c835195ac1419d10ae6b2dc17217