Bug: 123101769 Test: build Merged-In: I416d741947b1a15e66ebf71b8104c4b2ec95e310 Change-Id: I416d741947b1a15e66ebf71b8104c4b2ec95e310 (cherry picked from commit 83e7b920)