Merge changes I76a868ae,If3cf6592,I18078a54
am: f0b2cc77eb

Change-Id: I1f2b5fcb3662e6870e642118571806873f6201e6