Merge 816999927539771114f066c07545e0e1d43e58ac on remote branch

Change-Id: I6cd329461c3252697896d95ae5108f5bb0f6c955