Merge changes I828ff9d5,Id7844c3a
am: 5fa30dbc25

Change-Id: I03a6e7774ca4996b0b12a6fc67895f605e2d2848