This reverts commit f154cf018994bc8a814996e4e0345c6388507054. Reason for revert: Temporary rollback to allow ag/4819964 to go into pi-dev (and into master). Change-Id: I607ec64aa9da3b0b1adf49bd361f9ed4927dba05