Merge changes Ic4218b49,Ib91e16d8 am: a6712f8077
am: 1e34aab155

Change-Id: I11cdaa8c4d259b45905fc3a636281f93543aac30