Merge changes Icb6f7466,Ibf6238c9 am: eef231567c am: d1fa3c2380 am: 2eb2c0b276
am: 10ffcd12e9

Change-Id: I5286296ee5f9ea19fe2b3184db21c3b734a8a565