Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: edab226d0e am: 6fe110fa36
am: 3d3fa22698

Change-Id: Ic6d639358c3310820bd925df93d4843d7edffc57