Merge commit '80410b55f1eccf345fb6a01ca9a277935ac4098f' * commit '80410b55f1eccf345fb6a01ca9a277935ac4098f': Still use ro.monkey
Merge commit '80410b55f1eccf345fb6a01ca9a277935ac4098f' * commit '80410b55f1eccf345fb6a01ca9a277935ac4098f': Still use ro.monkey