Merge "Fix null point exception on MediaDevice" into rvc-dev am: 1ecd4528fb

Change-Id: Iaf7a2e699befd758b027dd241e825abacc0a900a