Merge "Finalize string for usage alerts." into nyc-mr2-dev am: f15b23ad65
am: 718de5da30

Change-Id: I09589fddda36e95cd99993383c7ab427b8bc6d9e