Merge changes Ifddf4991,If7804f94,I9d96d8ff,I6108dba5,I5429996a
am: 5809417697

Change-Id: I9d13a82c197a9df5be98964c20f048cdcb72b7f5