Merge a4907cdba3fd4b89f98ebcded601405e49805076 on remote branch

Change-Id: Ic8e4ee3c04fccbb7d861aa82ba79a2ef32dd8923