Merge "Remove @removed method" into oc-dev am: bbcf5fba1c
am: 211d99d1b9

Change-Id: I9400d1f49af2e35771d402f2879c85e29e4604f0