Merge 74c5a53980f0c5dfa5a193383f905cb0dbf3762c on remote branch

Change-Id: I7e641f6795f1027e520c2e0dbdf5819bae627520