Merge changes I0527ef62,I0d66a93f,I528ef380,Ia9140851,If1874867, ... am: f9bd812ef0
am: 2a6ee3da25

Change-Id: Ie0c823ffa7ab21edab820d08bdc6346748039f35