Merge changes I76a868ae,If3cf6592,I18078a54 am: f0b2cc77eb am: 81da382475
am: f7f062138b

Change-Id: Ia82e973f0dd1f77f0ef31ac385783a1e3a2e64df