Merge "Add missing dependency" am: 33b7fd3f13 am: c466c17e70
am: a9dffa2bfc

Change-Id: I226f5f630e34de2ad119443aafb3f6f424f8e7ec