Merge aa4244a9803b71465ec80fa10323ccd8c5b6ae79 on remote branch

Change-Id: Ib61706daad48fab6bfd2d753ba582084dc8879ff