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

Change-Id: I2fb0e62a0dadbfd70920e49e66354be1e8f130c4