Merge "Tweaks for forward compatibility" into stage-aosp-master