Merge changes I01b45c86,I10307aea,Iefccd6ff,Ibbda8e9a,I71a7f59b
am: 2f0ac4fb44

Change-Id: Iec648d4baa8d70aa54064f73724209aa671df5e3