Misc changes needed for micropaper integration.
am: 11ab2075fe

Change-Id: Idf2c392e3e5d643d4bc0f03397f3c546f65a3100