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

Change-Id: I2905bdb1974c0e880620e0da0fd9a176499f0e6f