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

Change-Id: I11704eb5f6046a153b3aba34cd10c2f9b6fbd044