Merge "Fix the nullpointer bug in monkey test." into nyc-mr1-dev am: dd90acf2c0
am: 69db34ed2e
am: 6ad307140a
Change-Id: Ieef6eb6ef4f51cd9084738a80b2d021735ce9a86
This commit is contained in: