Merge "Update hidden API toast message"
am: 10034d94cf

Change-Id: I7e5c4c5333be8d1bc5722b0924c31a8ad94be29e