Test: manual inspection Bug: 67869554 Merged-In: Ib40ea6eface48948a43551ac77d255209237acdb Change-Id: Ib40ea6eface48948a43551ac77d255209237acdb