This reverts commit 3cf57d72. Reason for revert: the topic breaks git_qt-dev-plus-aosp Change-Id: I4ee625982dac1b12755e9ebc6e0cdb2bfbd25613