Merge "Controls API - Flag controls support" into rvc-dev am: 897187dcfa

Change-Id: I00f1675670c354c5b03ce638f0fc7a73ee70bc9b