Merge "Add Feature Flag support." into arc-apps
am: 0c1f58a368

Change-Id: I74c9b3657257558d8147ed2f07a64b9821787dc6