Snap for 4784261 from ca37085a0787ad04e6d87cc67940653885333980 to pi-release

Change-Id: I2cfd126dffdf77e9d7b8adae6266db9fc350e20b
tree: 7d8fba327c516746ce54f551a54077f016febe41
  1. service-t/
  2. Android.mk