Merge changes I1250730c,I7d00848c
am: 4bcdcfebd4

Change-Id: I2f19490a2340bdc2630162dfe9a277dffc5041fa
tree: 21a1f344cd4d05781bdbd04d098d916f1d984017
  1. core/
  2. services/
  3. tests/