Merge e0698f362cf6fef74f2504e63b8844dedce85275 on remote branch

Change-Id: I1d0be296949a260c7c0dd35fea92d7706a089cee