Bug: http://b/78026329 Test: bionic unit tests Merged-In: I806f2bd193998dfe352372476104876edb27aebf Change-Id: I806f2bd193998dfe352372476104876edb27aebf