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

Change-Id: I6c82dc811f3118733d3afffa7ddb6d5016d4f075