Merge commit '21da33570278762d7e9375b83eb74130bf82728d' * commit '21da33570278762d7e9375b83eb74130bf82728d': First pass at replacing native plugin views with java.
Merge commit '21da33570278762d7e9375b83eb74130bf82728d' * commit '21da33570278762d7e9375b83eb74130bf82728d': First pass at replacing native plugin views with java.