Merge "fixed mockview" into kitkat-cts-dev
automerge: b7a630f  -s ours

* commit 'b7a630fc0d7989dfc4416bc2c9a594809fff8756':
  fixed mockview