Merge "Allow overriding disabled changes in final release." am: 43fe983a6b

Change-Id: I1fb776743125717d6bec8ceacc89a4c3f82f35d5