Test: build Bug: 145711825 Bug: 145716674 Bug: 145716707 Bug: 145716705 Change-Id: Idfc5943b3b1d5476f921e303a0088618eebcaeb6