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

Change-Id: I9a09c822976ffd6055a470d3724051773f762626