Merge "Adding a level of indirection." into qt-dev am: 1e2621d1f7
am: ab09c69953

Change-Id: I83c6b81610b063e73dc23c2eaf144eb53dc03b1d