Merge b43ceea27aa2fcc0c13eb466fd6903394ef309af on remote branch

Change-Id: I8603c9d369afa16f57843884f3a3744468efc948