Merge 8577c75da5858b61ddef1a1e94c5c94d09f3015c on remote branch

Change-Id: I7d9a111e85521538df288dbe6a2d56fc09e89ccd