Merge "Fix multiton issue" am: 78b285b367
am: 6d7751a13b

Change-Id: Ie09b193b7f6fce5bfa9998193bc050d9469064c9