Merge "Features tweaks:" into arc-apps
am: 71155c91f8

Change-Id: I6ca87bbebfe0aa295bf3333f4995c9b60f9e5da3