Merge changes from topic "language_filtering" into pi-dev
am: 46bdacd22f

Change-Id: I721c9cc5f2c82bd6530d304bd679faa3b25cb134