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

Change-Id: I1cd8be0afcee6aed89d95fd5013eb860e88c5555