[automerger skipped] Merge changes from topics...

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

Change-Id: Ibea9d77f3d4653797108d54e0c6c45e389f60461