Merge "Not specify return val of View#onSaveInstanceState" into oc-dev am: 1454afce82
am: 89d98d34cb

Change-Id: I93d3cbb6e0b6e7bbc7a535c0ebf437c16319075f