Test: m Bug: 119840313 Merged-In: Ia2ba3e4ed69d35310838ed57e03dfc122c3579db (cherry picked from commit 42b30e7a) Change-Id: Ic357031086b80442b5d3e249fb4fe26b8202ba63