Merge "Streamline testInstall_compatibleContext()"
am: 476d58c6bd

Change-Id: I99631c3166ced487e990f28f0e7c10c180d6473a