Merge "Add unit tests for simulator"
am: 4955648c4c

Change-Id: Ibf7c9092ea71f166c38f7feb644892d96f1da64c