Add Android metadata. am: d4b3f738e6
am: 3985f9a74a

Change-Id: I2180cd735cab424f3d28a2634b7fe1851af953bd