Merge "Set Root.FLAG_LOCAL_ONLY for MTP roots." into nyc-mr1-dev am: 5e252cecd1 am: 94d659ea6a
am: 9a51449f16

Change-Id: I677cd46759a6ed7477ddf5eb12bd9f16c6991215