Merge changes I4faf15bd,If328eac6 am: c275dab214
am: 2ce02ce572

Change-Id: Id34045ced9fe1e7b482da5facddca436b73da639