This reverts commit b37e9aa9. Reason for revert: trying again Test: make native Change-Id: Ide23f0a752fd6ca88e44449e996eb5809db6712d