Merge changes from topic "ion-unit-tests"
am: 6f4f7091aa

Change-Id: I8756a3eaead7a926ed715a7eb385124107d796ab