Fix http://b/issue?id=2086484 and http://b/issue?id=2087539

Change-Id: I392e52ac821a2eabd40c26024dbc587e6e63236f
2 files changed