Merge changes I8405c4fe,I52e6143d
am: a38de2e343

Change-Id: Ie9d96d5d76ad3941eaf9b12d8430d29b2d1c6530