Merge changes I9d94e252,If4a543d3,I0af7cda9 am: 799f55fb01 am: f3a96243c9

Change-Id: I0c0ea02f592fba22e54fdbeb3854684570032299