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

Change-Id: Icebea575559312f464f4a303bb5f3221653e2a0b