Merge changes I9c71dbe4,I6a1ab31a am: 8b6558e26f
am: 6cf56760d6

Change-Id: I45bcefd72a7512bc56f003285549be0bb9a3e12f