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

Change-Id: I0bbf12431baa4c4dc9e3db897b354a3ac5b8e605