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