Merge changes I51635278,I04c0038e
am: 80e48117c5

Change-Id: Ic8c06b6408bcff5d37c5cfb344380ef7e1c3e0df