Merge changes Iff879def,I79c72346 am: 89562f11c8
am: cfd87fe514

Change-Id: I95e3d5da730ba6257f9d75ff7fb98b6ca12b5604