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

Change-Id: I9ecbf4ad764d0f96ddc34ccd24ce0fea9836ac04