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

Change-Id: I87124972884cc8aafa51d346ba97ff2895514dc9