Merge 3cc4f96fe5cac77b1b6e62a32c466edce09dbebe on remote branch

Change-Id: Iabf5f5bc86cfe59a6c8a8aed228f1199077b96f4