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

Change-Id: Ifd385b2d9dc33d07d4c3c3b313af4aad64ddbdc7