Merge changes I828ff9d5,Id7844c3a am: 5fa30dbc25
am: 335ac41e2a

Change-Id: I32ff54768b0eaa0da1e45c084735833550b19786