Merge "Update to support staging behavior"
am: ec16825cb8

Change-Id: Iee19b80e6b722cd87c70b48870e4040713f47fa2