base

Fixed bad merge conflict resolution

https://android-review.googlesource.com/#/c/137534/ was accepted
and merged on 03/04/15. However, a bad merge conflict resolution
caused half of the change to be reverted. This adds back the missing
change.

Change-Id: I4f7c2503e60321b692e12316961958b149baf4ea