Merge 59af40fb2db2630bc7d02b7097d046d462d8dce9 on remote branch

Change-Id: Ib93b52ddadb42f2a2f8d2054156071cc3d01c871