Merge "Update to support staging behavior" am: ec16825cb8 am: 1fd9390f0b am: 01d885e095
am: d864847828

Change-Id: Ic8fd365ef1ed0079a39f00dc3f53e22080066239