[automerger skipped] Merge changes I0ac8c022,Ia6ce0608,Ibc030d2a am: 055202128f am: f21eb55362 am: 3fba868d69 -s ours
am skip reason: Change-Id I0ac8c022f70cdf9305c183996c2464a8e04ba5ae with SHA-1 b67261b01c is in history

Change-Id: Ifd8c1689565b3f0c3dbd4ba083255b5fba22142e
tree: 07c60c0fffbfc6837b66b0e7ab666334e959a579
  1. core/
  2. services/
  3. tests/