Test: $ runtest frameworks-net pass Bug: 32198976 (cherry picked from commit 8b06bcdf) Change-Id: Ib3be06d2678c3fcfe4fa9d7b77f50c6e8812db3d