Merge changes I51ee7070,I499a70a9
am: 59e1ab234c

Change-Id: I86d5c8b423f26c3a965bedad59753d374d137306