Merge "Remove non-SDK API toast"
am: 13c2382d4f

Change-Id: Iab7f96cc1c91367a0a677dfe52c6fae4a77c30ff