Merge "Set stealth mode during inflation" into pi-dev am: dae216cfcb
am: 7f1f354a6e

Change-Id: I5ee74471cf6987864942cceb3c29b954582cfb8c