Merge 53537be207f87ad5ccae9d24037052b7d407f125 on remote branch

Change-Id: Iba76b769448923df4b8247367216e8f8e2afd4b9