Merge changes I53055724,I06914911 into pi-dev am: c1428baf1b
am: 1baeb9c3e6

Change-Id: Idbe39c912b3de9d7f341bd0aec6598571b41ce93