DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master Bug: 120848293 Change-Id: I47810d4bb7dbe7e50c9a3b318b27d62d3be437c0