Merge dcac6da91623250d9608b2690be054268ab4d87c on remote branch

Change-Id: I1616e7cb8f5c208a2ec1d40f6c831be4aef25c72