This reverts commit 0ac5304598. Reason for revert: unbreak FlagFlipper Test: m Change-Id: I3c00d97bcb39d50a54b46fb61eaa30e8fcb0c9a5
0ac5304598