Merge changes I9067b933,I64fac7e1 am: fe9b71d734
am: 8f1a4f806c

Change-Id: I9f0c4478d5ac1ad699039db84664457b4643f4ff