Merge a17a340ddd594ab125002b330a51860cb0943e20 on remote branch

Change-Id: I1190524a89277f0ccbb23d678e0971137cfb17fc