b/16690237 manual cherry pick to make master bootable, since automerger does not seem to be working Change-Id: I3ac50c8fd50fc799afcfc76126a5fd0c9ba0a5f4 (cherry picked from commit cb92d507167fcce059c4ae91dc46b496f49b4fa3)
8b2de134
bb97753b