Merge a316ba13df4bf0cc896668e6b0c67971136a4ddf on remote branch

Change-Id: I85f8ae079b748870c25a241671e5dc94e8b0f075