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

Change-Id: Id6fe791310761aa715fdf0e37760052a1534a4f0