Merge "Fixed build breakage caused by AOSP submission http://go/oag/c/143360"