Merge "Prevent dream service finishSelf before it was attached" into rvc-dev am: 22404310 am: 47a6d4e2 Change-Id: I83acc78b37063d4414a11a2e311e0cd161791e67