am 384f55ff: (-s ours) Merge "Tweaks for forward compatibility" into stage-aosp-master

* commit '384f55fff01a9d0630b801abd016b82ded4c5984':
  Tweaks for forward compatibility