Merge 32b9a16915fe9e7910651bf2a48e0649ca07fb90 on remote branch

Change-Id: I12c220a9f2fc53902b51ab9ddec731a4fac089f8