Merge changes I156bfefd,I14b0b7e8
am: 455364c6cb

Change-Id: I36d6325403f82451aeeab22c371334bbef8cb87b