Merge "Remove unnecessary code and masking" into rvc-dev am: 256a392f59

Change-Id: I7b8532b4b599564d6a9f65d50c0362fd3746b6a4