Merge "Update the DP4 setup instruction for api level 24" into nyc-dev