Test: m -j Bug: 156041159 Change-Id: Ie0fd99df5b1d8776b6e3c29f7fb2da4759bb465d Merged-In: Ie0fd99df5b1d8776b6e3c29f7fb2da4759bb465d (cherry picked from commit ee7dd8f2)