code sample fixes reviewed separately, see Change-Id: I1d760b75d1f2bfe1ec90c71471867577bd146241 fixing bugs: b/10798358 b/10796990 b/10603728 b/7962328 Change-Id: I1e0f6668ec8d2b103b88c385f1f067d30ecc7178
Change-Id: Ifc757a2cb55781d5c42f9256cb698aa5a3a54bb8 (cherry picked from commit 6da22f88434543e8796e0151f4bb11d74c16e847)
Change-Id: Idc55a0b368c1d2c1e7d4999601b739dd57f08eb3