Merge pi-dr1-dev to aosp-master am: ba570ad29a
am: 7790c1b5d9

Change-Id: I154e132a2396d52f97a708ecf38c51d5c9cac076