Merge "Replaced Build.IS_DEBUGGABLE" am: 81491a1265 am: 503ceb05ec

Change-Id: Ib7cd8e99e1fe9d6c22c2b81c02b22eca464cb313