Bug 33390320 Test: Adding a constant only; "m -j32" Change-Id: Ie601978afd1f6da0e3fecd50e64d8af1f84a94af