Merge changes I664fb325,I5e289469
am: 701001688f

Change-Id: Ieafa0716c008f6ab439b0305145f6273875283e1