Fix unit tests am: 968e41783d am: db6c6d0ce3
am: 9758b79b0e

Change-Id: I021fc115c7b907ec6c8f411367e80dcb5f42d58a