Bug: 29517229 Test: manual Test: compile framework Change-Id: I1306a16a88b6bac2b4c53f6e9b5883dfdb36cedb