Merge c3ad76b3b976c93547e29785d6762b5788e95043 on remote branch

Change-Id: I481f612377c58d9dff3c017668931642d730d111