Merge changes I601bc725,I1bd0ab91 am: 855a7a989b
am: b64809ddac

Change-Id: I7a6fdbd53b5e1c46ba5feff72ffef27241e9d29f