[automerger skipped]Merge changes from topic "regex_instance" into pi-dev
am: 94759e8a1b  -s ours

Change-Id: I7840977ef0c590457bc758816f63491d727fcfb8