Merge cc19a81b588a3caca422c4669d71d9fcd8b5b22b on remote branch

Change-Id: Ifa2021447f010aa724762b4be1937671fbd9d65f