Merge aac9814f30f563951c49db9692b00a868e23bee8 on remote branch

Change-Id: Ia702c5654ba8f0d4033a5e1802183bc8e36c02b8