DO NOT MERGE Bump to 1.5.16 (1/2)
am: bd34bbc374  -s ours

Change-Id: Ia96b214d29c76437276a27706b0fccd5e9a84c30