Merge changes If420bd66,Icbb161ca,Ida190e5a,Iae75781f
am: 2ec8b8bcb6

Change-Id: I2dd27a886aabfe0b4733ee9559886f917ccd921e