Merge changes I5b3833d0,I7836a013
am: 433e5a8050

Change-Id: I605abbbc616b46d3e6e7347f6fb2a6dbaaee9660