After removing local.properties
Merge commit 'd7af6de383688de2e95189f6259bcaacf10d9bcf'