Merge 50c3bef9e6bfcf366ba1f9537fcdb0b5ac276185 on remote branch

Change-Id: I3d280ac87219af38c4bd0daa47f7d6200e60b6d4