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

Change-Id: I2db7aa3136facd9841c52e6c79e38fd140b41df1