Merge changes I8c6b2d1d,I06e0f759,I95d79809
am: cb8ed207d2

Change-Id: I0b0a272d704788d3f21a0365e34f6b09a792529b