[automerger skipped] Merge changes from topics "remove_feature_flag_emergency", "faster_emergency_feature_flag" into pi-dev
am: 77c2e6736a  -s ours

Change-Id: Ib8215f880522e88bb5866fb9a39dc36d52d13b26