Merge "Add type to framework manifest file."
am: dd24d59820

Change-Id: I2b1c8a25937509d25da9680059d49adaca076fc1