Merge b170b442ad9ab9a16346b7dfde60fb4cef5603b2 on remote branch

Change-Id: I793ae8c7da4ffd9f6a1cad6bd9fc3159aa9a675b