tree 27bbaf226a0ae9f8109983f1a8dec2c2cb09b251
parent 35aa808fda5fba71712a883507a3ccfd885014dc
parent 5ca3145db9ba87ecd01034f865521e3e85dbbb62
author Chalard Jean <jchalard@google.com> 1539745145 -0700
committer android-build-merger <android-build-merger@google.com> 1539745145 -0700

Merge "Address comments from #725016"
am: 5ca3145db9

Change-Id: I1ac39d690ed6ee68e9909a7f2c4f06d2ffdcd0c9