Merge "Added Settings intents" into rvc-dev am: a35a860c36

Change-Id: I07a9265159b4e9a40019a0f82be385e6ea31496b