Merge changes from topic "acct-suggestion-1" am: f3935f0268
am: 5da9fe3d79

Change-Id: I2d342eef80a5bcfed1e538add6c5807f5faf3dd1