Merge "Resurrect the pose tool." into oc-dr1-dev am: 5af190c517
am: b71fc2624a

Change-Id: Ie96fb61dcc1494f126394a4138729489188186b2