Merge changes I1d718e9d,Icc74ff16
am: 5e2ffa5ca9

Change-Id: Id81d39d89bf6abd88e0ccd132dcdfc39d1a530ba