Merge "DO NOT MERGE ANYWHERE Revert "Build: More tombstones in userdebug"" into oc-dr1-dev
am: f1ad51082c  -s ours

Change-Id: Ia5fade4a2cd1dc65373ca8646e97bc4ee2c8ec3a