Merge changes I325b13d5,I89719fe7
am: 31cb4583e5

Change-Id: Iaced543ab17ea87c8f701975764d957bc1b17fc7
tree: e1366247af8f427b9648647a3ca946c45b84a684
  1. core/
  2. services/
  3. wifi/