Merge "Remove unnecessary code and masking" into rvc-dev am: 256a392f59 am: 3771a7e614 am: 88a89b419a

Change-Id: I053e882dacc24f5e2a42ec7d4bb7cdad889adc61