Merge changes I1f50e09d,I8b2bb87a am: 1051fa2d74
am: 22359a67a7

Change-Id: I353524015c6d98c82213034790e1fe266d7d8060