[automerger skipped] Merge "Change to stub library" am: 99a80f963f am: c624712880 -s ours
am: 84278c4f4b -s ours
am skip reason: change_id Ibe0eb0c679e59819a89c6b3a93144501acb50cbe with SHA1 f2bda26e2c is in history

Change-Id: I13450ed4a93fe8a2d08e8346184ceda1768d91a9