Merge "Add checks for double_loadable dependencies" am: f14277fc3a
am: 4b75790b30

Change-Id: I55a480df1a035ff80531a86e0dcd0f535b088bf4