This reverts commit a6dfd79ea40e16a4942971ee8c5a0000a0b749d7. Reason for revert: not master Change-Id: If3e14e6f42bc05cdce610a1beb65c592fbb998fd (cherry picked from commit 6fe189b233491b3700cdcc9a3c1d54d30754d06e)