Merge "Build extra data in wakeup anomaly" into oc-dr1-dev am: b327a6bccd
am: a62c67be0e

Change-Id: Ie7b1fbc669d0d740cf7fec7180ba64894ee73761