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

Change-Id: I712e054a11d886405043442f2205ff8167af0008