Test: builds Bug: 29337859 Bug: 32163131 Bug: 64976634 Change-Id: Ifd064736c9fcb633b72e56e93b7baa5f4a5ff051