Merge changes I5187d17c,I49a76582
am: 7781a6d4c1

Change-Id: I9c484916a9e8adf11342c01b77077e8016a29b5f