Merge changes If7ea17d5,If6364fd6 into rvc-dev am: 8275fb7d66

Change-Id: I95e6c3665c85e3649e26ead23c1ab4f0a8ae5c72