Test: pass Bug: 38174080 Merged-In: I683455736eed35e6ced24e2763c2bdb5fb6c9601 Change-Id: I683455736eed35e6ced24e2763c2bdb5fb6c9601