bug: 22700067 bug: 22693954 (cherry picked from commit 3d5aa45e) Change-Id: I3ced2120e8401dd75f3d3a4aac20322ca9223c6f