Fix some tests am: 65bc46b3b5
am: 03f4ffe2cb

Change-Id: I91cd8e6143dbd74d0c186faf6bf078720e057b6c