Merge ca53c3dd004d68cb46886d2d726a5731f969ec71 on remote branch

Change-Id: I4d6748cbad725b094e4e1c981840cc1a395b6394