Merge "Update hidden API toast message" am: 10034d94cf am: 42ab3eeb4c
am: 0a6ca96902

Change-Id: I2cc692827716043e0f9065c9c1be932642ed5856