Merge changes I9c71dbe4,I6a1ab31a
am: 8b6558e26f

Change-Id: I0fe6e8f2b79a31e5d49ebd56a2c5bace4b397ef1