Merge \"PIP: Handle layoutDirection changes\" into nyc-mr1-dev
am: 715e07a356

Change-Id: Ic37ec7762a49e4a59c9e699add5d1f5a7c7a8a3e