[automerger skipped] Clean up hidden constants am: be4fe78e0a am: 3492f71078
am: 4bd170390a -s ours
am skip reason: change_id I6e0b527d75987825ee70b6f7ac3b42331bc22571 with SHA1 5e17455390 is in history

Change-Id: Ic8a8fc926ca00ab5c49eabb4708a69f91a4168ab