Merge \"Fix UiBench MainActivity fragment\" into nyc-mr1-dev
am: 8b31db3621

Change-Id: I597e28d025569fec839ca7b02ea03b054a582a94