Merge changes from topic "ramdisk"
am: d66e442c21

Change-Id: If16d9e37a50ff3de093f37c6200d29f9f22e3703