Merge "Merge "Change reference to Build.IS_DEBUGGABLE" am: 4d83e674 am: 9ee90ab4" into qt-qpr1-dev-plus-aosp