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

Change-Id: I52acdd7cfa145f61f613dc94cb34bd6646b5b418