Merge pi-dr1-dev to aosp-master am: 913a142594 am: 6cb24f2f77
am: 80f28c8a99

Change-Id: I7bd4b020519edb26af0c8b5ec9635595d6eacb27