Merge "Ensure bounds are updated together." into oc-dev
am: a968d33edb

Change-Id: I462a00824c15864a5f68cd9a647da68f9119aff0