Merge changes from topic "ramdisk" am: d66e442c21 am: 49e66cc894

Change-Id: I84171e2f324c953aee403f95761fed62e555dab7