Merge changes I0ff0c4f4,I6bdfa2f5 am: a63eab4f6c
am: ac2645b1c3

Change-Id: Ieb73606fd2f92f491d83e08f84a277d8c25af857