Bug: 62821960 Bug: 68758843 Test: Manual Merged-In: I7a371d5fcee6a03bae3c530ce9f5ee252138c84b Change-Id: I7a371d5fcee6a03bae3c530ce9f5ee252138c84b