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

Change-Id: I647e891b6e7b0dbfe02c8f9f5d7a4bebc3ea18c5