311ec8962b
Bug: 36904684 Bug: 37929893 Bug: 36068989 Test: make -j 32 dist checkbuild Change-Id: If9b11b212852cb1048d54db2224dab4acf2d93e0