Merge changes I852d1509,Id28ce2cb
am: 732586d0b4

Change-Id: I78d1659e26e10188e06206c3e10b80112d99cea7