9310e3db45
b/20728113 so that we can share them with support lib. Change-Id: I231c0d20c41ee53342d8a975c2db5a31854b9d40 (cherry picked from commit 7b2a46fee0f95b9ae2485db36e0d279730623c4a)