Discussed and proposed in https://docs.google.com/spreadsheets/d/1OJ6EXJ-Zys21mZ1BHgJeWkcfLq0pPxBR765r46ck80U/edit#gid=0
Bug: 62346128
Test: compile
Change-Id: Ied111e4fe39cadaab738beca0a1c0a74eb27b01e
Merged-In: Ied111e4fe39cadaab738beca0a1c0a74eb27b01e
(cherry picked from commit f8f3e97cc5)