Merge changes I0699ed67,I58293973,I9c795dcb,I0b731d10,Ia2097345 am: 3acc7dc1f8

Change-Id: Ie88b998ac41f3781998e1215f59afeaf9c0ad407