Merge "Change reference to Build.IS_DEBUGGABLE" am: 4d83e67433 am: 9ee90ab489

Change-Id: I3e88554793c9b3ee646c4aef9852094716f414db