Merge "Support multiple"
am: 336c1fbad4

Change-Id: Ic0d42414e99f92d2f0187cc4086288d1e84d0d90