Merge 54fb7bee9c01a28d09990f00c8dd107acff7c14f on remote branch

Change-Id: Ie4595a9628743712f7f52a1ca8af41a01ebfb89f