Merge "Update feature flag mapping owners" am: 16eab7c16d
am: 6d52af0b55

Change-Id: Id0249ae47337c5dca7c60cab580f4e1be4159486