Merge "Make framework-statsd stubs use the new defaults" into rvc-dev am:...
Merge "Make framework-statsd stubs use the new defaults" into rvc-dev am: 6efada1a am: a1047201 am: bc85f68a am: f3387fff
Change-Id: I0c43581a0cb79643d90bcaeddb37c55ab31ae6b1