Fixes for: b/12909231 b/12887320 b/12872407 Change-Id: I1fefb41f7ceea2e4e80262834d1c631b6b8daf7e
68291f33
db3158ea