Merge "Update to support staging behavior" into oc-dev am: e4b2d28b91
am: 1434fbb46c

Change-Id: Ide1c2ddc8a61dfb560871a4e8b394f5c4751ffd2