Merge "Do not bundle cross user." into nyc-dev am: 68a32b5aad
am: 47e0d29473

* commit '47e0d29473f529e39fa124a452e1d3677f4b7ea1':

Change-Id: Ib57d4f5ffdce9be18f36af336f88c663c360d70d