Merge changes from topic 'avb-early-mount' am: d7381375bb am: 04989a7a4b am: 0b2d83a64b
am: 4d70aa5541

Change-Id: If96228c7c72876d698bfb30867268dda9c616773