Merge changes I8d0c60e5,Ib8ad0ad6 am: a6bb369cb0
am: c7d9eb8636

Change-Id: Ia3ddeeaec8d6eace47376628405c427585ee1f2e