Mock Setting Hack

Change-Id: I53c82faeb1d8bc8e416442d193671129e8986048
Hack Mock 2

Change-Id: I05de92eda89fbe994c764c2d130d0fa4fee2d97c
Ingress Hack Werks

Change-Id: I943f00cb20b3deb92c39745aaea3e5aeadba37a7
Clean up logging

Change-Id: I3c08fb01860412cffe0e7f3a7369caa20199498a
Merge branch 'mr1-staging' into cm-10.1