Fix issues highlighted in http://ag/15440757

- check flag value first since it is cheaper to do that
- use Resources.ID_NULL as default instead of -1

Bug: 191048348

Test: N/A
Change-Id: I8703d9b41a12470584266bb7c60fb58374d290d9