Merge changes I65063e1f,I9090720f
am: 4a3459a352

Change-Id: I00fb227337c972bdb1ecc8aa8037e8e077efece0