enrc2b: no idea how this managed to get back in

Change-Id: Ifd24fd26db54e60172b6b41a9ccc6852ee6d6a21
Merge "enrc2b: no idea how this managed to get back in" into cm-11.0