Merge "Create ACTIVITY_TYPE_DREAM" into rvc-dev am: 389580c7 am: 1c205d5a am: 4955d304 am: 17bea571 Change-Id: I6b8952c3f1691095e14bd410d165c5d4a04952a5