Merge changes from topic "merge-incremental-vold" am: 10a372f1d2 am: 41c1c40afc

Change-Id: I542b7a48e7d94b78bf3fb01e44263e2b161df60f