Merge changes I6779a835,I4e3d8322
am: 1fbe962482

Change-Id: I99af01094a2e1d905f47b12822a036a1de6e3611