BUG: 30839080 BUG: 31007021 (cherry picked from commit a4dc2a7129) Change-Id: I35942e60493adebb22871541a34240368c691ee7
a4dc2a7129