Merge changes I1bf07301,I48e8ebf3 am: c17c5b00e1 am: d4aca92af5

Change-Id: Ia79b37398d0d94f993b257e8c8860d2b504ba076